Correct pluralisation of various diagnostic messages #64233
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @estebank |
Centril
reviewed
Sep 6, 2019
| @@ -200,7 +200,9 @@ impl<'tcx> ty::TyS<'tcx> { | |||
| ty::Array(_, n) => { | |||
| let n = tcx.lift_to_global(&n).unwrap(); | |||
| match n.try_eval_usize(tcx, ty::ParamEnv::empty()) { | |||
| Some(n) => format!("array of {} elements", n).into(), | |||
| Some(n) => { | |||
| format!("array of {} element{}", n, if n != 1 { "s" } else { "" }).into() | |||
There was a problem hiding this comment.
This if $n != 1 { "s" } else { "" } business should be refactored to a function in some utility module in rustc_errors. Would be good to grep for "s" } else { "".
There was a problem hiding this comment.
That would make a nice beginner issue. I'll open one.
|
📌 Commit 0b97726 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Sep 7, 2019
…ebank Correct pluralisation of various diagnostic messages
bors
added a commit
that referenced
this pull request
Sep 7, 2019
Rollup of 10 pull requests Successful merges: - #63919 (Use hygiene for AST passes) - #63927 (Filter linkcheck spurious failure) - #64149 (rustc_codegen_llvm: give names to non-alloca variable values.) - #64192 (Bail out when encountering likely missing turbofish in parser) - #64231 (Move the HIR CFG to `rustc_ast_borrowck`) - #64233 (Correct pluralisation of various diagnostic messages) - #64236 (reduce visibility) - #64240 (Include compiler-rt in the source tarball) - #64241 ([doc] Added more prereqs and note about default directory) - #64243 (Move injection of attributes from command line to `libsyntax_ext`) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.